cleanup: Use destructuring for imports from GI

This is *much* nicer than repetitive "imports.gi" lines ...

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/399

diff --git a/HACKING.md b/HACKING.md
index f1b3d3765cea41ff06b72de9957f8f28427b6e6b..a9a92ea8db570996f807df770ff1b165f206e988 100644 (file)
--- a/HACKING.md
+++ b/HACKING.md
@@ -80,9 +80,7 @@ e.g. `imports.ui.popupMenu`.
 Each import block should be sorted alphabetically. Don't import modules you
 don't use.
 ```javascript
-    const GLib = imports.gi.GLib;
-    const Gio = imports.gi.Gio;
-    const St = imports.gi.St;
+    const { GLib, Gio, St } = imports.gi;
 
     const Main = imports.ui.main;
     const Params = imports.misc.params;

diff --git a/js/extensionPrefs/main.js b/js/extensionPrefs/main.js
index bfa820b599851eaf3e7a1ca65cf6ba37f9a67488..438788f1d9b3c37f70273980eef6ab4d416e6322 100644 (file)
--- a/js/extensionPrefs/main.js
+++ b/js/extensionPrefs/main.js
@@ -1,10 +1,5 @@
 const Gettext = imports.gettext;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Gio = imports.gi.Gio;
-const Gtk = imports.gi.Gtk;
-const Gdk = imports.gi.Gdk;
-const Pango = imports.gi.Pango;
+const { Gdk, GLib, Gio, GObject, Gtk, Pango } = imports.gi;
 const Format = imports.format;
 
 const _ = Gettext.gettext;

diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
index ecd47bffd53cfc788e6a7bd232303faac5a03f7d..d7f53a92e5ba20c442c6c05d89dcc5fa612f9914 100644 (file)
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -1,15 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const Pango = imports.gi.Pango;
+const { Clutter, Pango, Shell, St } = imports.gi;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
 const Animation = imports.ui.animation;
 const Batch = imports.gdm.batch;
 const GdmUtil = imports.gdm.util;
 const Params = imports.misc.params;
-const Shell = imports.gi.Shell;
 const ShellEntry = imports.ui.shellEntry;
 const Tweener = imports.ui.tweener;
 const UserWidget = imports.ui.userWidget;

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index dc125c2137412e1755e09536932c779ef555db10..8ea1a86a23bce5f80868a7797178b53783b7fec5 100644 (file)
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -16,18 +16,9 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-const AccountsService = imports.gi.AccountsService;
-const Atk = imports.gi.Atk;
-const Clutter = imports.gi.Clutter;
-const Gdm = imports.gi.Gdm;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Meta = imports.gi.Meta;
-const Pango = imports.gi.Pango;
-const Shell = imports.gi.Shell;
+const { AccountsService, Atk, Clutter, Gdm, Gio,
+        GLib, GObject, Meta, Pango, Shell, St } = imports.gi;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
 const AuthPrompt = imports.gdm.authPrompt;
 const Batch = imports.gdm.batch;

diff --git a/js/gdm/util.js b/js/gdm/util.js
index 6599b7f7d5ad4b1c801a72fef568bc3b97c96de9..2e9935250be2964b2bb1bdcea70b883a7d680776 100644 (file)
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -1,8 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
+const { Clutter, Gio, GLib } = imports.gi;
 const Signals = imports.signals;
 
 const Batch = imports.gdm.batch;

diff --git a/js/misc/fileUtils.js b/js/misc/fileUtils.js
index a2281a9b60487a355d9fe1b69a1bf924d8100861..64884162dc1b53753799d8a06ee82e0e42d38707 100644 (file)
--- a/js/misc/fileUtils.js
+++ b/js/misc/fileUtils.js
@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
+const { Gio, GLib } = imports.gi;
 const Config = imports.misc.config;
 
 function collectFromDatadirs(subdir, includeUserDir, processFile) {

diff --git a/js/misc/ibusManager.js b/js/misc/ibusManager.js
index fe86a8326afc3bd04ab066165531de35a185eef9..d20ad2f32a2ae5f6818a3421ffe67366c7a0ce2d 100644 (file)
--- a/js/misc/ibusManager.js
+++ b/js/misc/ibusManager.js
@@ -1,11 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
+const { Gio, GLib, IBus } = imports.gi;
 const Mainloop = imports.mainloop;
 const Signals = imports.signals;
 
-const IBus = imports.gi.IBus;
 const IBusCandidatePopup = imports.ui.ibusCandidatePopup;
 
 // Ensure runtime version matches

diff --git a/js/misc/inputMethod.js b/js/misc/inputMethod.js
index bd239e556983a97952102249e112ac0a06293fce..ce2002a09de8c98e3053e44c38ef855179f13ba7 100644 (file)
--- a/js/misc/inputMethod.js
+++ b/js/misc/inputMethod.js
@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-const Clutter = imports.gi.Clutter;
-const GObject = imports.gi.GObject;
-const IBus = imports.gi.IBus;
+const { Clutter, GObject, IBus } = imports.gi;
+
 const Keyboard = imports.ui.status.keyboard;
 
 var InputMethod = GObject.registerClass(

diff --git a/js/misc/introspect.js b/js/misc/introspect.js
index b9b0a987b8cedc660fdc190a286b8ad9dd941ef2..f7a7f2fe6d799c26b6ad9bfe4bbc5e26c809743f 100644 (file)
--- a/js/misc/introspect.js
+++ b/js/misc/introspect.js
@@ -1,7 +1,4 @@
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
+const { Gio, GLib, Meta, Shell } = imports.gi;
 
 const INTROSPECT_SCHEMA = 'org.gnome.shell';
 const INTROSPECT_KEY = 'introspect';

diff --git a/js/misc/keyboardManager.js b/js/misc/keyboardManager.js
index 5d720e88a2e0d9f8e10f42df8e8d54d8b8ac85e0..99e100231a2f0136fde0279fe467eddc71d9e0b0 100644 (file)
--- a/js/misc/keyboardManager.js
+++ b/js/misc/keyboardManager.js
@@ -1,8 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const GLib = imports.gi.GLib;
-const GnomeDesktop = imports.gi.GnomeDesktop;
-const Meta = imports.gi.Meta;
+const { GLib, GnomeDesktop, Meta } = imports.gi;
 
 const Main = imports.ui.main;
 

diff --git a/js/misc/loginManager.js b/js/misc/loginManager.js
index 30b0e7bd748618928112655e0609cf54c11855a6..f615b4f999300bc0d179f8a0973f7fef6b9ae2af 100644 (file)
--- a/js/misc/loginManager.js
+++ b/js/misc/loginManager.js
@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
+const { GLib, Gio } = imports.gi;
 const Signals = imports.signals;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;

diff --git a/js/misc/modemManager.js b/js/misc/modemManager.js
index 82849ba1ea1d1d605560855c3c3587da210966fb..7c6c39a734622e6dc9ccf69fc59d162a860590a3 100644 (file)
--- a/js/misc/modemManager.js
+++ b/js/misc/modemManager.js
@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Gio = imports.gi.Gio;
-const NMA = imports.gi.NMA;
+const { Gio, NMA } = imports.gi;
 const Signals = imports.signals;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;

diff --git a/js/misc/objectManager.js b/js/misc/objectManager.js
index a708ac81894c691bdc06e5b22ad22ce39aee0c47..56b4cc9b4a4c81ecaf9d6da263ebb8642f689c93 100644 (file)
--- a/js/misc/objectManager.js
+++ b/js/misc/objectManager.js
@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
+const { Gio, GLib } = imports.gi;
 const Params = imports.misc.params;
 const Signals = imports.signals;
 

diff --git a/js/misc/systemActions.js b/js/misc/systemActions.js
index 8b2175e04f8d5cddc4d1fd3b080808bada9d8b71..aa79bfe54da2cc6abfbd4823a156b12021fdac6a 100644 (file)
--- a/js/misc/systemActions.js
+++ b/js/misc/systemActions.js
@@ -1,10 +1,4 @@
-const AccountsService = imports.gi.AccountsService;
-const Clutter = imports.gi.Clutter;
-const Gdm = imports.gi.Gdm;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Meta = imports.gi.Meta;
-const GObject = imports.gi.GObject;
+const { AccountsService, Clutter, Gdm, Gio, GLib, GObject, Meta } = imports.gi;
 
 const GnomeSession = imports.misc.gnomeSession;
 const LoginManager = imports.misc.loginManager;

diff --git a/js/misc/util.js b/js/misc/util.js
index c5b22dccf2095597d25b62aa24b03fa10bd70536..a8bea649f1becbf0e3a3ab3a3975f501bbd965cf 100644 (file)
--- a/js/misc/util.js
+++ b/js/misc/util.js
@@ -1,14 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, GLib, GObject, Shell, St } = imports.gi;
 const Gettext = imports.gettext;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
 const Mainloop = imports.mainloop;
 const Signals = imports.signals;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;

diff --git a/js/misc/weather.js b/js/misc/weather.js
index 5e0ce315e1d192f3365b15e05cd452eab52e828a..aaec36cf438e1f2cc526e9296cf8446b341183e9 100644 (file)
--- a/js/misc/weather.js
+++ b/js/misc/weather.js
@@ -1,9 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Geoclue = imports.gi.Geoclue;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GWeather = imports.gi.GWeather;
+const { Geoclue, Gio, GLib, GWeather } = imports.gi;
 const Signals = imports.signals;
 
 const PermissionStore = imports.misc.permissionStore;

diff --git a/js/perf/hwtest.js b/js/perf/hwtest.js
index 86e3d6f700d4325200b73d5260f9aabf246ca5f7..d5b417da32b6e2a6a0465a655b385e2c927af401 100644 (file)
--- a/js/perf/hwtest.js
+++ b/js/perf/hwtest.js
@@ -1,9 +1,6 @@
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const Gtk = imports.gi.Gtk;
+const { Clutter, Gio, Gtk, Shell } = imports.gi;
 const Main = imports.ui.main;
 const Scripting = imports.ui.scripting;
-const Shell = imports.gi.Shell;
 
 let METRICS = {
     timeToDesktop:

diff --git a/js/portalHelper/main.js b/js/portalHelper/main.js
index cbc29d056f72360854533942b9fa01c5539b11be..e163d6574b9e7663a9fdbdc4ca8c42763ad9f9e2 100644 (file)
--- a/js/portalHelper/main.js
+++ b/js/portalHelper/main.js
@@ -1,12 +1,6 @@
 const Format = imports.format;
 const Gettext = imports.gettext;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Gio = imports.gi.Gio;
-const Gtk = imports.gi.Gtk;
-const Pango = imports.gi.Pango;
-const Soup = imports.gi.Soup;
-const WebKit = imports.gi.WebKit2;
+const { Gio, GLib, GObject, Gtk, Pango, Soup, WebKit2: WebKit } = imports.gi;
 
 const _ = Gettext.gettext;
 

diff --git a/js/ui/accessDialog.js b/js/ui/accessDialog.js
index 59a0495aacc04c0796eef53a03515d0536fba9fa..69ba42c8d784da7d2ba180194ef543216726bd98 100644 (file)
--- a/js/ui/accessDialog.js
+++ b/js/ui/accessDialog.js
@@ -1,7 +1,4 @@
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Shell = imports.gi.Shell;
+const { Clutter, Gio, GLib, Shell } = imports.gi;
 
 const CheckBox = imports.ui.checkBox;
 const Dialog = imports.ui.dialog;

diff --git a/js/ui/altTab.js b/js/ui/altTab.js
index d2162f858da127fee42bf27907c4bb2dfbaef976..cdd5d8e21970123e8e41e0a684e94fb744a82f67 100644 (file)
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@@ -1,14 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
+const { Atk, Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-const Atk = imports.gi.Atk;
 
 const Main = imports.ui.main;
 const SwitcherPopup = imports.ui.switcherPopup;

diff --git a/js/ui/animation.js b/js/ui/animation.js
index 96d33c96fdd0edfadb3dd36ca6d47d0d40899630..470a6ffbbfeaa15054d6338c7304eae4dc7f4a47 100644 (file)
--- a/js/ui/animation.js
+++ b/js/ui/animation.js
@@ -1,9 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
+const { GLib, Gio, St } = imports.gi;
 const Mainloop = imports.mainloop;
-const St = imports.gi.St;
 
 const Tweener = imports.ui.tweener;
 

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 4494a6b695887a59e3605407987043db5b2b8f4f..adaefa7dd15ce7031692a3620ac833c354375def 100644 (file)
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -1,13 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Shell = imports.gi.Shell;
+const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
 const Signals = imports.signals;
-const Meta = imports.gi.Meta;
-const St = imports.gi.St;
 const Mainloop = imports.mainloop;
 
 const AppFavorites = imports.ui.appFavorites;

diff --git a/js/ui/audioDeviceSelection.js b/js/ui/audioDeviceSelection.js
index b10eb7d3ed583e5ef80df5d932aa128edeee95c4..25fde891fc4712a01a549a0940c56afad511deba 100644 (file)
--- a/js/ui/audioDeviceSelection.js
+++ b/js/ui/audioDeviceSelection.js
@@ -1,9 +1,4 @@
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
+const { Clutter, Gio, GLib, Meta, Shell, St } = imports.gi;
 
 const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;

diff --git a/js/ui/background.js b/js/ui/background.js
index 874bda39049b667684b656f11b24acb133bf248c..bcd9ffc13ea8ebf596147601a71a94cfd5866309 100644 (file)
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -93,12 +93,7 @@
 //     MetaBackgroundImage         MetaBackgroundImage
 //     MetaBackgroundImage         MetaBackgroundImage
 
-const Clutter = imports.gi.Clutter;
-const GDesktopEnums = imports.gi.GDesktopEnums;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GnomeDesktop = imports.gi.GnomeDesktop;
-const Meta = imports.gi.Meta;
+const { Clutter, GDesktopEnums, Gio, GLib, GnomeDesktop, Meta } = imports.gi;
 const Signals = imports.signals;
 
 const LoginManager = imports.misc.loginManager;

diff --git a/js/ui/backgroundMenu.js b/js/ui/backgroundMenu.js
index 69886ed514bfc117de15da492a35f4d61c1ba96b..7d3941bc73adbd0e28f79c38e433b8f53c0233d1 100644 (file)
--- a/js/ui/backgroundMenu.js
+++ b/js/ui/backgroundMenu.js
@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
+const { Clutter, St } = imports.gi;
 
 const BoxPointer = imports.ui.boxpointer;
 const Main = imports.ui.main;

diff --git a/js/ui/barLevel.js b/js/ui/barLevel.js
index 0c32ee5a82e467b911973e31f29ccbb7a7468cd0..d8d37369df6aeb860264d64bc119ec1db6eb2afa 100644 (file)
--- a/js/ui/barLevel.js
+++ b/js/ui/barLevel.js
@@ -1,8 +1,6 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Atk = imports.gi.Atk;
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
+const { Atk, Clutter, St } = imports.gi;
 const Signals = imports.signals;
 
 var BarLevel = class {

diff --git a/js/ui/boxpointer.js b/js/ui/boxpointer.js
index 35d191342d5175a8f417bc89429f8f2963e3d456..3387b31bbf6c84e67059dc0683b3a6fc7bd5aea2 100644 (file)
--- a/js/ui/boxpointer.js
+++ b/js/ui/boxpointer.js
@@ -1,10 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const GObject = imports.gi.GObject;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
+const { Clutter, GObject, Meta, Shell, St } = imports.gi;
 
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;

diff --git a/js/ui/calendar.js b/js/ui/calendar.js
index 32a99344c7b92b76b7bf4a0c7cc4a2dc1d72f07b..28e0d86d2d31418f6c73649f20e4c1a1eeaaee46 100644 (file)
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -1,11 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const St = imports.gi.St;
+const { Clutter, Gio, GLib, Shell, St } = imports.gi;
 const Signals = imports.signals;
-const Shell = imports.gi.Shell;
 
 const Main = imports.ui.main;
 const MessageList = imports.ui.messageList;

diff --git a/js/ui/checkBox.js b/js/ui/checkBox.js
index 2d3787b7073a5db6aa2f2df3ddabf833be432dc3..deaa34ab701f33280d8faf08307adfedccf19641 100644 (file)
--- a/js/ui/checkBox.js
+++ b/js/ui/checkBox.js
@@ -1,6 +1,4 @@
-const Clutter = imports.gi.Clutter;
-const Pango = imports.gi.Pango;
-const St = imports.gi.St;
+const { Clutter, Pango, St } = imports.gi;
 
 var CheckBox = class CheckBox {
     constructor(label) {

diff --git a/js/ui/closeDialog.js b/js/ui/closeDialog.js
index f90d25f8eea64d6fe0799d5e49ec2dde77e41a61..ee2045ec79fc12a03437aa7d575a04c244e3718e 100644 (file)
--- a/js/ui/closeDialog.js
+++ b/js/ui/closeDialog.js
@@ -1,11 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
+const { Clutter, Gio, GLib, GObject, Meta, Shell } = imports.gi;
 
 const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;

diff --git a/js/ui/components/automountManager.js b/js/ui/components/automountManager.js
index 1bfadd2cad9809698cd642e0ac33304c888d56db..01e8f1e7140c001c3c2df991b92a853b9a708e95 100644 (file)
--- a/js/ui/components/automountManager.js
+++ b/js/ui/components/automountManager.js
@@ -1,8 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const { Gio, GLib } = imports.gi;
 const Mainloop = imports.mainloop;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
 const Params = imports.misc.params;
 
 const GnomeSession = imports.misc.gnomeSession;

diff --git a/js/ui/components/autorunManager.js b/js/ui/components/autorunManager.js
index 20499daeebaee7e5444677eb5c91471a3e9fb778..34c7d62509c33a9f8654a04dd1905c113dceee13 100644 (file)
--- a/js/ui/components/autorunManager.js
+++ b/js/ui/components/autorunManager.js
@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Gio = imports.gi.Gio;
-const St = imports.gi.St;
+const { Gio, St } = imports.gi;
 
 const GnomeSession = imports.misc.gnomeSession;
 const Main = imports.ui.main;

diff --git a/js/ui/components/keyring.js b/js/ui/components/keyring.js
index 4801e3d90a92c4cf7e5dd96bd6fd846456a79244..0d9f1e4663f8b1d3458ef56b8e38dfa80d70bd26 100644 (file)
--- a/js/ui/components/keyring.js
+++ b/js/ui/components/keyring.js
@@ -1,12 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Shell = imports.gi.Shell;
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
-const Pango = imports.gi.Pango;
-const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
-const Gcr = imports.gi.Gcr;
+const { Clutter, Gcr, Gio, GObject, Pango, Shell, St } = imports.gi;
 
 const Animation = imports.ui.animation;
 const Dialog = imports.ui.dialog;

diff --git a/js/ui/components/networkAgent.js b/js/ui/components/networkAgent.js
index 9bc9037a54164ab67003657f93c748733a7e023b..f871c732d907316dd6d43da6d9c5f6dc29cb3e75 100644 (file)
--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@@ -1,13 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const NM = imports.gi.NM;
-const Pango = imports.gi.Pango;
-const Shell = imports.gi.Shell;
+const { Clutter, Gio, GLib, NM, Pango, Shell, St } = imports.gi;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
 const Config = imports.misc.config;
 const Dialog = imports.ui.dialog;

diff --git a/js/ui/components/polkitAgent.js b/js/ui/components/polkitAgent.js
index cf575911256e5fc47530bd3ad3538724f989d8e6..21feb40903aad012053e39257e783d9baf8ba756 100644 (file)
--- a/js/ui/components/polkitAgent.js
+++ b/js/ui/components/polkitAgent.js
@@ -1,15 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const { AccountsService, Clutter, Gio, GLib,
+        Pango, PolkitAgent, Polkit, Shell, St } = imports.gi;
 const Signals = imports.signals;
-const Shell = imports.gi.Shell;
-const AccountsService = imports.gi.AccountsService;
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
-const Pango = imports.gi.Pango;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const Polkit = imports.gi.Polkit;
-const PolkitAgent = imports.gi.PolkitAgent;
 
 const Animation = imports.ui.animation;
 const Dialog = imports.ui.dialog;

diff --git a/js/ui/components/telepathyClient.js b/js/ui/components/telepathyClient.js
index d7221b16856ea02591ff9e2acecfa26af3ce3004..1df865f3044d2925ff8bf573d1a68b866ebc56da 100644 (file)
--- a/js/ui/components/telepathyClient.js
+++ b/js/ui/components/telepathyClient.js
@@ -1,18 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
+const { Clutter, Gio, GLib, GObject, St } = imports.gi;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
-const St = imports.gi.St;
 
 var Tpl = null;
 var Tp = null;
 try {
-    Tpl = imports.gi.TelepathyLogger;
-    Tp = imports.gi.TelepathyGLib;
+    ({ TelepathyGLib: Tp, TelepathyLogger: Tpl } = imports.gi);
 } catch(e) {
     log('Telepathy is not available, chat integration will be disabled.');
 }

diff --git a/js/ui/ctrlAltTab.js b/js/ui/ctrlAltTab.js
index 302aaeda58c2765d6d9ac3f0d9d594f75ec0add1..4415f6d7a8d6c71622dde730579b6c8692cdb303 100644 (file)
--- a/js/ui/ctrlAltTab.js
+++ b/js/ui/ctrlAltTab.js
@@ -1,9 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
+const { Clutter, Meta, Shell, St } = imports.gi;
 
 const Main = imports.ui.main;
 const SwitcherPopup = imports.ui.switcherPopup;

diff --git a/js/ui/dash.js b/js/ui/dash.js
index 921b1d783f2a34f503e0d10ec98e49cd39ea992d..e60cdd8adff88cbcd11f02fdce16f19d37cec44b 100644 (file)
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -1,13 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Signals = imports.signals;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
+const { Clutter, GLib, GObject, Meta, Shell, St } = imports.gi;
 const Mainloop = imports.mainloop;
+const Signals = imports.signals;
 
 const AppDisplay = imports.ui.appDisplay;
 const AppFavorites = imports.ui.appFavorites;

diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
index 9e21bd232a2ea5b5caed6103a31aed3a3084cb46..c29d33719d20007bc1c719b2c96e9e5783ef8275 100644 (file)
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -1,12 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const GLib = imports.gi.GLib;
-const GnomeDesktop = imports.gi.GnomeDesktop;
-const GObject = imports.gi.GObject;
-const GWeather = imports.gi.GWeather;
-const Clutter = imports.gi.Clutter;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
+const { Clutter, GLib, GnomeDesktop,
+        GObject, GWeather, Shell, St } = imports.gi;
 
 const Util = imports.misc.util;
 const Main = imports.ui.main;

diff --git a/js/ui/dialog.js b/js/ui/dialog.js
index f9d116eeea560551e58da53645448b0529666e07..809acffbba8f6c0dde6971ff006afa4618326e5b 100644 (file)
--- a/js/ui/dialog.js
+++ b/js/ui/dialog.js
@@ -1,10 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
-const Pango = imports.gi.Pango;
-const St = imports.gi.St;
+const { Clutter, Gio, GObject, Pango, St } = imports.gi;
 
 var Dialog = GObject.registerClass(
 class Dialog extends St.Widget {

diff --git a/js/ui/dnd.js b/js/ui/dnd.js
index c5a1c0517533cab56b260116d7b61da7389500cc..554e877736333572b72adf52915135887bf034d6 100644 (file)
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -1,15 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const St = imports.gi.St;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
+const { Clutter, GLib, Meta, Shell, St } = imports.gi;
 const Signals = imports.signals;
-const Tweener = imports.ui.tweener;
-const Main = imports.ui.main;
 
+const Main = imports.ui.main;
 const Params = imports.misc.params;
+const Tweener = imports.ui.tweener;
 
 // Time to scale down to maxDragActorSize
 var SCALE_ANIMATION_TIME = 0.25;

diff --git a/js/ui/edgeDragAction.js b/js/ui/edgeDragAction.js
index 007921d8998cb5a55e02c955469cc770bfbd6198..e811dda216741b8847bd15ed8af364268d9ad675 100644 (file)
--- a/js/ui/edgeDragAction.js
+++ b/js/ui/edgeDragAction.js
@@ -1,9 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const GObject = imports.gi.GObject;
-const Meta = imports.gi.Meta;
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
+const { Clutter, GObject, Meta, St } = imports.gi;
 
 const Main = imports.ui.main;
 

diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index bab712e273c249ce6d27befe31c20c39a1c29b12..0d4aa9d4d154114e45f12223e06434e08b4727e9 100644 (file)
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -18,14 +18,8 @@
 
 const Mainloop = imports.mainloop;
 
-const AccountsService = imports.gi.AccountsService;
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Pango = imports.gi.Pango;
-const Polkit = imports.gi.Polkit;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
+const { AccountsService, Clutter, Gio,
+        GLib, Pango, Polkit, Shell, St }  = imports.gi;
 
 const CheckBox = imports.ui.checkBox;
 const GnomeSession = imports.misc.gnomeSession;

diff --git a/js/ui/environment.js b/js/ui/environment.js
index 7c239408b0026d5e674c4972688cb068607aad42..e22ec7402045b1bc69ddb771ddcdf5650eeb1115 100644 (file)
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@@ -9,11 +9,8 @@ imports.gi.versions.Gtk = '3.0';
 imports.gi.versions.TelepathyGLib = '0.12';
 imports.gi.versions.TelepathyLogger = '0.2';
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, GLib, Shell, St } = imports.gi;
 const Gettext = imports.gettext;
-const GLib = imports.gi.GLib;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
 
 // We can't import shell JS modules yet, because they may have
 // variable initializations, etc, that depend on init() already having

diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js
index 642be51ee9bf4735a1c73b3a57177a138374a2e3..9aed29c693b653efab1c2853c2abccad9ca4a764 100644 (file)
--- a/js/ui/extensionDownloader.js
+++ b/js/ui/extensionDownloader.js
@@ -1,10 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const Soup = imports.gi.Soup;
-const St = imports.gi.St;
+const { Clutter, Gio, GLib, Soup, St } = imports.gi;
 
 const Config = imports.misc.config;
 const ExtensionUtils = imports.misc.extensionUtils;

diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
index 18c046cc5403e172585af54b64434e8a37f49f48..6244c39b44fe50d43c3ea9cbd77476182801c5fd 100644 (file)
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -1,10 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const { Gio, St } = imports.gi;
 const Signals = imports.signals;
 
-const Gio = imports.gi.Gio;
-const St = imports.gi.St;
-
 const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 

diff --git a/js/ui/grabHelper.js b/js/ui/grabHelper.js
index 55e82a829097ed0f3f576ee98985323c01c79f73..4ba0b1b568bf896be7312365cb47db4a9940d465 100644 (file)
--- a/js/ui/grabHelper.js
+++ b/js/ui/grabHelper.js
@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
+const { Clutter, St } = imports.gi;
 
 const Main = imports.ui.main;
 const Params = imports.misc.params;

diff --git a/js/ui/ibusCandidatePopup.js b/js/ui/ibusCandidatePopup.js
index 5bea998249fadb95d9e4577144e25c4cf26a2236..20d76fd8617bd569cab2597b5cedb6eb6225bc81 100644 (file)
--- a/js/ui/ibusCandidatePopup.js
+++ b/js/ui/ibusCandidatePopup.js
@@ -1,9 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const IBus = imports.gi.IBus;
+const { Clutter, IBus, St } = imports.gi;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
 const BoxPointer = imports.ui.boxpointer;
 const Main = imports.ui.main;

diff --git a/js/ui/iconGrid.js b/js/ui/iconGrid.js
index cd91e0c62ec2f198a9c467827d904bfa4018aaa4..789a834f9d89373b89c09df155d3a71eb5a6c734 100644 (file)
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -1,9 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const GObject = imports.gi.GObject;
-const Meta = imports.gi.Meta;
-const St = imports.gi.St;
+const { Clutter, GObject, Meta, St } = imports.gi;
 
 const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;

diff --git a/js/ui/inhibitShortcutsDialog.js b/js/ui/inhibitShortcutsDialog.js
index dc1d5a3199e9b0e0af5f3ab5489ff1786a128263..46e760a9838e69d0958537a11f0cf20664f41e1a 100644 (file)
--- a/js/ui/inhibitShortcutsDialog.js
+++ b/js/ui/inhibitShortcutsDialog.js
@@ -1,9 +1,4 @@
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
-const Gtk = imports.gi.Gtk;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
+const { Clutter, Gio, GObject, Gtk, Meta, Shell } = imports.gi;
 
 const Dialog = imports.ui.dialog;
 const ModalDialog = imports.ui.modalDialog;

diff --git a/js/ui/kbdA11yDialog.js b/js/ui/kbdA11yDialog.js
index c09466b4fd5c3ddb288742624149e871929a34e0..b9d005fe7b8b5b823a67e67cb1f0faa09feb75dc 100644 (file)
--- a/js/ui/kbdA11yDialog.js
+++ b/js/ui/kbdA11yDialog.js
@@ -1,6 +1,5 @@
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
+const { Clutter, Gio, GObject } = imports.gi;
+
 const Dialog = imports.ui.dialog;
 const ModalDialog = imports.ui.modalDialog;
 

diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index cc42e1c8ae8b70e544b1c5641063b841463f2189..c8eb29719553a110a664e98c61d9a2b395bb495e 100644 (file)
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -1,14 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Meta = imports.gi.Meta;
+const { Clutter, Gio, GLib, GObject, Meta, St } = imports.gi;
 const Signals = imports.signals;
-const St = imports.gi.St;
-const InputSourceManager = imports.ui.status.keyboard;
 
+const InputSourceManager = imports.ui.status.keyboard;
 const IBusManager = imports.misc.ibusManager;
 const BoxPointer = imports.ui.boxpointer;
 const Layout = imports.ui.layout;

diff --git a/js/ui/layout.js b/js/ui/layout.js
index 5bf3ec573ab1ca3c1f24ce8d351595e00bdbc69a..c25cd474d86e3fa5e6480f822b81f52dcb9c0d3a 100644 (file)
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -1,12 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
+const { Clutter, GLib, GObject, Meta, Shell, St } = imports.gi;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
 const Background = imports.ui.background;
 const BackgroundMenu = imports.ui.backgroundMenu;

diff --git a/js/ui/lightbox.js b/js/ui/lightbox.js
index 7a702883a5da720583af1d1393526df3d16245cc..c7e4d51f2842c794405d00e97076752429b15d7d 100644 (file)
--- a/js/ui/lightbox.js
+++ b/js/ui/lightbox.js
@@ -1,10 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const GObject = imports.gi.GObject;
+const { Clutter, GObject, Shell, St } = imports.gi;
 const Signals = imports.signals;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
 
 const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;

diff --git a/js/ui/lookingGlass.js b/js/ui/lookingGlass.js
index 185ed421a7fbed5a3f3f19ac357143867769eb90..e839ad75e8cead02ae057f4df7742502266d778a 100644 (file)
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -1,16 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const Cogl = imports.gi.Cogl;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
-const Meta = imports.gi.Meta;
-const Pango = imports.gi.Pango;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
+const { Clutter, Cogl, Gio, GLib,
+        GObject, Meta, Pango, Shell, St } = imports.gi;
 const Mainloop = imports.mainloop;
+const Signals = imports.signals;
 const System = imports.system;
 
 const History = imports.misc.history;
@@ -24,15 +17,9 @@ const JsParse = imports.misc.jsParse;
 const CHEVRON = '>>> ';
 
 /* Imports...feel free to add here as needed */
-var commandHeader = 'const Clutter = imports.gi.Clutter; ' +
-                    'const GLib = imports.gi.GLib; ' +
-                    'const GObject = imports.gi.GObject; ' +
-                    'const Gio = imports.gi.Gio; ' +
-                    'const Gtk = imports.gi.Gtk; ' +
-                    'const Mainloop = imports.mainloop; ' +
-                    'const Meta = imports.gi.Meta; ' +
-                    'const Shell = imports.gi.Shell; ' +
+var commandHeader = 'const { Clutter, Gio, GLib, GObject, Gtk, Meta, Shell } = imports.gi; ' +
                     'const Main = imports.ui.main; ' +
+                    'const Mainloop = imports.mainloop; ' +
                     'const Tweener = imports.ui.tweener; ' +
                     /* Utility functions...we should probably be able to use these
                      * in the shell core code too. */

diff --git a/js/ui/magnifier.js b/js/ui/magnifier.js
index b33c300c6cfbd02fb795b21a1d9378794b5ef4ce..753151ac9f0801ef44e1beac4bab9345a9ebfc76 100644 (file)
--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@@ -1,16 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Atspi = imports.gi.Atspi;
-const Clutter = imports.gi.Clutter;
-const Cogl = imports.gi.Cogl;
-const GDesktopEnums = imports.gi.GDesktopEnums;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
+const { Atspi, Clutter, Cogl, GDesktopEnums,
+        Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
 const Signals = imports.signals;
 
 const Background = imports.ui.background;

diff --git a/js/ui/main.js b/js/ui/main.js
index 5d5b9dfc62783e78b4ac34f561b5753510ca6989..f9556f14dee7a898d0ea552259733ff5d93fc40f 100644 (file)
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -1,12 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
+const { Clutter, Gio, GLib, Meta, Shell, St } = imports.gi;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
 
 const AccessDialog = imports.ui.accessDialog;
 const AudioDeviceSelection = imports.ui.audioDeviceSelection;

diff --git a/js/ui/messageList.js b/js/ui/messageList.js
index 29bf1c4e8c79d639a6fb6b4eae03faaf04a006a4..bd97ffcb0481f1bbff2d67b365beb224131b6045 100644 (file)
--- a/js/ui/messageList.js
+++ b/js/ui/messageList.js
@@ -1,14 +1,7 @@
-const Atk = imports.gi.Atk;
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
+const { Atk, Clutter, Gio, GLib, GObject, Meta, Pango, St } = imports.gi;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
-const Meta = imports.gi.Meta;
-const Pango = imports.gi.Pango;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
 const Calendar = imports.ui.calendar;
 const Tweener = imports.ui.tweener;

diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 43b7877901174e551e7d31989ee952af76e06cfd..dcba4788ffeb6b356bd033b2bee676790331e7e3 100644 (file)
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1,14 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
+const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
 const Calendar = imports.ui.calendar;
 const GnomeSession = imports.misc.gnomeSession;

diff --git a/js/ui/modalDialog.js b/js/ui/modalDialog.js
index b9cc11a8cba457574a0c6f92e96879ecb3a53883..258e3b0a1a2e6817210cdce20a5120f7a65ba666 100644 (file)
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -1,17 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
+const { Atk, Clutter, Shell, St } = imports.gi;
 const Signals = imports.signals;
-const Atk = imports.gi.Atk;
-
-const Params = imports.misc.params;
 
 const Dialog = imports.ui.dialog;
 const Layout = imports.ui.layout;
 const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
+const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
 
 var OPEN_AND_CLOSE_TIME = 0.1;

diff --git a/js/ui/mpris.js b/js/ui/mpris.js
index 4968b4e7a1bc6b7f458f62a19d3394c1ca9f3e5d..e900bceb8b5a9975ba2f11b2e281c5d099fb248d 100644 (file)
--- a/js/ui/mpris.js
+++ b/js/ui/mpris.js
@@ -1,7 +1,5 @@
-const Gio = imports.gi.Gio;
+const { Gio, Shell, St } = imports.gi;
 const Signals = imports.signals;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
 
 const Calendar = imports.ui.calendar;
 const Main = imports.ui.main;

diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index df53962f9beb52593297a152e1b63a0c7b5b6e06..4bdede841cb26231fdafb6adfdf52779cf966186 100644 (file)
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -1,11 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const GdkPixbuf = imports.gi.GdkPixbuf;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Shell = imports.gi.Shell;
+const { GdkPixbuf, Gio, GLib, Shell, St } = imports.gi;
 const Mainloop = imports.mainloop;
-const St = imports.gi.St;
 
 const Config = imports.misc.config;
 const Main = imports.ui.main;

diff --git a/js/ui/osdMonitorLabeler.js b/js/ui/osdMonitorLabeler.js
index 3c8d49318039c0ea3ebcb5d7390f5fbdf5556e84..55b4d3c210b612ca18374304d16e392c9c304e7c 100644 (file)
--- a/js/ui/osdMonitorLabeler.js
+++ b/js/ui/osdMonitorLabeler.js
@@ -1,11 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const St = imports.gi.St;
+const { Clutter, Gio, Meta, St } = imports.gi;
 
 const Main = imports.ui.main;
-const Meta = imports.gi.Meta;
 
 var FADE_TIME = 0.1;
 

diff --git a/js/ui/osdWindow.js b/js/ui/osdWindow.js
index 018d4f660a9b19f312f993f498a9c23e71b38d9c..abf8c27cc017a582dcca5320c76b23753620198b 100644 (file)
--- a/js/ui/osdWindow.js
+++ b/js/ui/osdWindow.js
@@ -1,16 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const St = imports.gi.St;
+const { Clutter, GLib, GObject, Meta, St } = imports.gi;
+const Mainloop = imports.mainloop;
 
 const BarLevel = imports.ui.barLevel;
 const Layout = imports.ui.layout;
 const Main = imports.ui.main;
-const Mainloop = imports.mainloop;
 const Tweener = imports.ui.tweener;
-const Meta = imports.gi.Meta;
 
 var HIDE_TIMEOUT = 1500;
 var FADE_TIME = 0.1;

diff --git a/js/ui/overview.js b/js/ui/overview.js
index fc8b3671e791fcbe64ecd0f0751da54420b786fb..dc6ad1821b1ccdca2e555784c2adf60fe9bbc97e 100644 (file)
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -1,12 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const Meta = imports.gi.Meta;
+const { Clutter, GLib, Meta, Shell, St } = imports.gi;
 const Mainloop = imports.mainloop;
 const Signals = imports.signals;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
 
 const Background = imports.ui.background;
 const DND = imports.ui.dnd;

diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js
index 129eb5166eca7c3a7775611a8d13cd921f5ee681..5b95b749d4ba87265957c2a5631c1654ad067b6b 100644 (file)
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -1,9 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const GObject = imports.gi.GObject;
-const Clutter = imports.gi.Clutter;
-const Meta = imports.gi.Meta;
-const St = imports.gi.St;
+const { Clutter, GObject, Meta, St } = imports.gi;
 
 const Dash = imports.ui.dash;
 const Main = imports.ui.main;

diff --git a/js/ui/padOsd.js b/js/ui/padOsd.js
index 1015312950b8e6ccd47bf60cacd1c8e1927791ea..760f48a37dce09b0d43cbc9499600d83d0ff37ac 100644 (file)
--- a/js/ui/padOsd.js
+++ b/js/ui/padOsd.js
@@ -1,15 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Meta = imports.gi.Meta;
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
-const Rsvg = imports.gi.Rsvg;
-const GObject = imports.gi.GObject;
-const GLib = imports.gi.GLib;
-const Gtk = imports.gi.Gtk;
-const Gio = imports.gi.Gio;
-const GDesktopEnums = imports.gi.GDesktopEnums;
-const Atk = imports.gi.Atk;
+const { Atk, Clutter, GDesktopEnums, Gio,
+        GLib, GObject, Gtk, Meta, Rsvg, St } = imports.gi;
 const Signals = imports.signals;
 
 const Main = imports.ui.main;

diff --git a/js/ui/pageIndicators.js b/js/ui/pageIndicators.js
index 43e6fcf4ba535a369378ffa601b59fef6fc2e8a0..8a1202c80174dc9a2c5732cde3f6dbe6896dacf7 100644 (file)
--- a/js/ui/pageIndicators.js
+++ b/js/ui/pageIndicators.js
@@ -1,8 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const GObject = imports.gi.GObject;
-const St = imports.gi.St;
+const { Clutter, GObject, St } = imports.gi;
 
 const Tweener = imports.ui.tweener;
 const { ANIMATION_TIME_OUT, ANIMATION_MAX_DELAY_OUT_FOR_ITEM, AnimationDirection } = imports.ui.iconGrid;

diff --git a/js/ui/panel.js b/js/ui/panel.js
index 6026c8a9e7ccd205ca5602964261658b0f334d9a..d719c841e479da8f51361a5f8931486f6e39a6e8 100644 (file)
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -1,16 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const { Atk, Clutter, Gio, GLib, GObject, Gtk, Meta, Shell, St } = imports.gi;
 const Cairo = imports.cairo;
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Gtk = imports.gi.Gtk;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-const Atk = imports.gi.Atk;
 
 const Animation = imports.ui.animation;
 const Config = imports.misc.config;

diff --git a/js/ui/panelMenu.js b/js/ui/panelMenu.js
index 9cdbb1066819d36ea79d64c5ad6d2e67f2b351de..bafafc11e652a2b3f3ed6d1bb05d1db0d87a3fe4 100644 (file)
--- a/js/ui/panelMenu.js
+++ b/js/ui/panelMenu.js
@@ -1,10 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const GObject = imports.gi.GObject;
+const { Atk, Clutter, GObject, St } = imports.gi;
 const Signals = imports.signals;
-const St = imports.gi.St;
-const Atk = imports.gi.Atk;
 
 const Main = imports.ui.main;
 const Params = imports.misc.params;

diff --git a/js/ui/pointerWatcher.js b/js/ui/pointerWatcher.js
index 8bc5771b7ffc4b46bbeb9f74fd316b8d74c11203..d1722bdaa6cdf8e6732d60307a0e4f7ddb50aa03 100644 (file)
--- a/js/ui/pointerWatcher.js
+++ b/js/ui/pointerWatcher.js
@@ -1,8 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const GLib = imports.gi.GLib;
+const { GLib, Meta } = imports.gi;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
 
 // We stop polling if the user is idle for more than this amount of time
 var IDLE_TIME = 1000;

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index a824eaecce3699c1e658719a01f79ea300088b66..843af82239c2f3242839742c0d3fbbe45a10a4aa 100644 (file)
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -1,12 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
-const Shell = imports.gi.Shell;
+const { Atk, Clutter, Gio, GObject, Shell, St } = imports.gi;
 const Signals = imports.signals;
-const St = imports.gi.St;
-const Atk = imports.gi.Atk;
 
 const BoxPointer = imports.ui.boxpointer;
 const GrabHelper = imports.ui.grabHelper;

diff --git a/js/ui/remoteSearch.js b/js/ui/remoteSearch.js
index b7abb9c775e0db016e5e9869778f048c51c6533e..1b9186bdc4d0f11f6c35c2938f00162a5823059a 100644 (file)
--- a/js/ui/remoteSearch.js
+++ b/js/ui/remoteSearch.js
@@ -1,10 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const GdkPixbuf = imports.gi.GdkPixbuf;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
+const { GdkPixbuf, Gio, GLib, Shell, St } = imports.gi;
 
 const FileUtils = imports.misc.fileUtils;
 

diff --git a/js/ui/runDialog.js b/js/ui/runDialog.js
index 3906e6d210f67066200d47f74576fe9c2d63bcef..49f14026f6bc61a1f3cc8ee1f17a78eb9131f90e 100644 (file)
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@@ -1,11 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Meta = imports.gi.Meta;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
+const { Clutter, Gio, GLib, Meta, Shell, St } = imports.gi;
 const Signals = imports.signals;
 
 const Main = imports.ui.main;

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index fe63b864a305032c9bc64bb95ce01d6e6739acd3..3f45b8acf54f4452d4e38762293763f18fa77fa9 100644 (file)
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -1,18 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const AccountsService = imports.gi.AccountsService;
+const { AccountsService, Clutter, Cogl, Gio, GLib,
+        GnomeDesktop, GObject, Meta, Shell, St } = imports.gi;
 const Cairo = imports.cairo;
-const Cogl = imports.gi.Cogl;
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GnomeDesktop = imports.gi.GnomeDesktop;
-const GObject = imports.gi.GObject;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
-const St = imports.gi.St;
 const TweenerEquations = imports.tweener.equations;
 
 const Background = imports.ui.background;

diff --git a/js/ui/screencast.js b/js/ui/screencast.js
index 2d99c711a97387abb629a3301bb1925ce32e88f5..0b0b14a8e309c4815b6cc96038d4aca51df7f4b9 100644 (file)
--- a/js/ui/screencast.js
+++ b/js/ui/screencast.js
@@ -1,8 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Shell = imports.gi.Shell;
+const { Gio, GLib, Shell } = imports.gi;
 const Signals = imports.signals;
 
 const Main = imports.ui.main;

diff --git a/js/ui/screenshot.js b/js/ui/screenshot.js
index a314dfceae780b659f806e043cca51ac70ba1704..9261535142af87b24cd599ec42aca5f2e6bafea9 100644 (file)
--- a/js/ui/screenshot.js
+++ b/js/ui/screenshot.js
@@ -1,13 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Gtk = imports.gi.Gtk;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
+const { Clutter, Gio, GLib, Gtk, Meta, Shell, St } = imports.gi;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
 const GrabHelper = imports.ui.grabHelper;
 const Lightbox = imports.ui.lightbox;

diff --git a/js/ui/scripting.js b/js/ui/scripting.js
index 495319591772133e43100a1ff9a3df7204a51c86..01bc2dd38d3b962287cc63999676d5202d3b4f54 100644 (file)
--- a/js/ui/scripting.js
+++ b/js/ui/scripting.js
@@ -1,10 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
+const { Gio, GLib, Meta, Shell } = imports.gi;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
 
 const Main = imports.ui.main;
 const Params = imports.misc.params;

diff --git a/js/ui/search.js b/js/ui/search.js
index 2a8415e29aece6cbe54cafa5c53c1f28d4fc13c0..fe4f6162bf43326929d85a99b420fa6d32dd0f9e 100644 (file)
--- a/js/ui/search.js
+++ b/js/ui/search.js
@@ -1,12 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
+const { Clutter, Gio, GLib, GObject, Shell, St } = imports.gi;
 const Signals = imports.signals;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
 
 const AppDisplay = imports.ui.appDisplay;
 const IconGrid = imports.ui.iconGrid;

diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js
index 05ac14fc9438205600757ca901b4ffe7b082a842..73d74becf6ea18b57eec187bbb4e2deef8679e61 100644 (file)
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@@ -1,10 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
+const { Gio, GLib, Meta, Shell } = imports.gi;
 const Lang = imports.lang;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
 
 const Config = imports.misc.config;
 const ExtensionSystem = imports.ui.extensionSystem;

diff --git a/js/ui/shellEntry.js b/js/ui/shellEntry.js
index d16de92861e467eeb03d46d683ef5a1b300f9cd2..79f1aad3e7ecd8d73f023d865512681a6f14a3c5 100644 (file)
--- a/js/ui/shellEntry.js
+++ b/js/ui/shellEntry.js
@@ -1,13 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
+const { Clutter, Shell, St } = imports.gi;
 
 const BoxPointer = imports.ui.boxpointer;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
 const PopupMenu = imports.ui.popupMenu;
-const Shell = imports.gi.Shell;
 
 var EntryMenu = class extends PopupMenu.PopupMenu {
     constructor(entry) {

diff --git a/js/ui/shellMountOperation.js b/js/ui/shellMountOperation.js
index 4445ae12d064f97c987a01149e3df3c1702fb127..f976f400f48acd0cb1753017547be894c6a708af 100644 (file)
--- a/js/ui/shellMountOperation.js
+++ b/js/ui/shellMountOperation.js
@@ -1,12 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, GLib, Pango, Shell, St } = imports.gi;
 const Signals = imports.signals;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Pango = imports.gi.Pango;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
 
 const CheckBox = imports.ui.checkBox;
 const Dialog = imports.ui.dialog;

diff --git a/js/ui/slider.js b/js/ui/slider.js
index 19e634e7b8f2fd45b10f9f63cca8f8dc1d6a815d..f9fa7320b664c53d82da7853d3a6b641f4ae59c2 100644 (file)
--- a/js/ui/slider.js
+++ b/js/ui/slider.js
@@ -1,7 +1,6 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Atk = imports.gi.Atk;
-const Clutter = imports.gi.Clutter;
+const { Atk, Clutter } = imports.gi;
 const Signals = imports.signals;
 
 const BarLevel = imports.ui.barLevel;

diff --git a/js/ui/status/accessibility.js b/js/ui/status/accessibility.js
index 5072913d20ea2e8b858a5a5589e9b5e9a1581e15..10223ec8444f09c357e08ff072a9e427ef03b6d8 100644 (file)
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -1,10 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
+const { Gio, GLib, GObject, St } = imports.gi;
 const Mainloop = imports.mainloop;
-const St = imports.gi.St;
 
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;

diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js
index f41be7250d530dae6d5cbfcacbcba6bf3779cebb..6282234ca85060d28bbadf3dbd2e923583d1f744 100644 (file)
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Gio = imports.gi.Gio;
-const GnomeBluetooth = imports.gi.GnomeBluetooth;
+const { Gio, GnomeBluetooth } = imports.gi;
 
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;

diff --git a/js/ui/status/brightness.js b/js/ui/status/brightness.js
index e45cf67c573972bee1fa8a0c3c285ac4359f6484..025f299087b7d8f10d0a05caf8b8edff490c25e5 100644 (file)
--- a/js/ui/status/brightness.js
+++ b/js/ui/status/brightness.js
@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Gio = imports.gi.Gio;
-const St = imports.gi.St;
+const { Gio, St } = imports.gi;
 
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;

diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index 7f830b6df9cadff6032be0fec0c201e51f887d05..c93906585c83d34e125195cf1de58391ce92809a 100644 (file)
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -1,15 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const IBus = imports.gi.IBus;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
-const St = imports.gi.St;
+const { Clutter, Gio, GLib, GObject, IBus, Meta, Shell, St } = imports.gi;
 const Gettext = imports.gettext;
+const Signals = imports.signals;
 
 const IBusManager = imports.misc.ibusManager;
 const KeyboardManager = imports.misc.keyboardManager;

diff --git a/js/ui/status/location.js b/js/ui/status/location.js
index 07474f536de1bf9fcf05269623d31bf24f2ad409..f030ae81b21ff655f3930b8b4190a4db039619c5 100644 (file)
--- a/js/ui/status/location.js
+++ b/js/ui/status/location.js
@@ -1,8 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
+const { Clutter, Gio, GLib, Shell } = imports.gi;
 
 const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;
@@ -10,7 +8,6 @@ const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const ModalDialog = imports.ui.modalDialog;
 const PermissionStore = imports.misc.permissionStore;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index c2c7a3dc536c63ace528e6ae107ffa918587ff09..21cbeac6127d7aff81930d847a712983ac1a1035 100644 (file)
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -1,12 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Gio = imports.gi.Gio;
+const { Clutter, Gio, GLib, GObject, NM, St } = imports.gi;
 const Mainloop = imports.mainloop;
-const NM = imports.gi.NM;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
 const Animation = imports.ui.animation;
 const Main = imports.ui.main;

diff --git a/js/ui/status/power.js b/js/ui/status/power.js
index 6ffd24e04cd32b96421d1155274faace5beaf8ec..3279811da0ba62895668d54c29ca4eaa8f452fcb 100644 (file)
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@@ -1,9 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Gio = imports.gi.Gio;
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
-const UPower = imports.gi.UPowerGlib;
+const { Clutter, Gio, St, UPowerGlib: UPower } = imports.gi;
 
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;

diff --git a/js/ui/status/system.js b/js/ui/status/system.js
index bbbc44ea10a654eb2b475db731c9cb446334e692..e06f179207d9dafe0b20a417b3a81282744ec87a 100644 (file)
--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@@ -1,12 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const AccountsService = imports.gi.AccountsService;
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-const GObject = imports.gi.GObject;
+const { AccountsService, Clutter, Gio, GLib, GObject, Shell, St } = imports.gi;
 
 const BoxPointer = imports.ui.boxpointer;
 const SystemActions = imports.misc.systemActions;

diff --git a/js/ui/status/thunderbolt.js b/js/ui/status/thunderbolt.js
index b7dadbc663ef210cd6b47cf3296f2324470448a1..b36819a531489a15b2ece6d87ce4142d8d6effd2 100644 (file)
--- a/js/ui/status/thunderbolt.js
+++ b/js/ui/status/thunderbolt.js
@@ -2,10 +2,7 @@
 
 // the following is a modified version of bolt/contrib/js/client.js
 
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Polkit = imports.gi.Polkit;
-const Shell = imports.gi.Shell;
+const { Gio, GLib, Polkit, Shell } = imports.gi;
 const Signals = imports.signals;
 
 const Main = imports.ui.main;

diff --git a/js/ui/status/volume.js b/js/ui/status/volume.js
index 365ec4123895956387c48a39a20cee9e9357ba1e..d555b426e741f1ea644e88d0567ff817c51d19fd 100644 (file)
--- a/js/ui/status/volume.js
+++ b/js/ui/status/volume.js
@@ -1,9 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const Gvc = imports.gi.Gvc;
-const St = imports.gi.St;
+const { Clutter, Gio, Gvc, St } = imports.gi;
 const Signals = imports.signals;
 
 const Main = imports.ui.main;

diff --git a/js/ui/switchMonitor.js b/js/ui/switchMonitor.js
index 8b726ba0696443728e0b58d9b30cb084c2be5457..df802fe24b94a14181ca6d8ff9836b4c3885afa2 100644 (file)
--- a/js/ui/switchMonitor.js
+++ b/js/ui/switchMonitor.js
@@ -1,9 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const GObject = imports.gi.GObject;
-const Meta = imports.gi.Meta;
-const St = imports.gi.St;
+const { Clutter, GObject, Meta, St } = imports.gi;
 
 const SwitcherPopup = imports.ui.switcherPopup;
 

diff --git a/js/ui/switcherPopup.js b/js/ui/switcherPopup.js
index d4a0003348c557bcf87ee8109b0954c29ef4901b..c28c22910505ac21fa1f82ee2d9ea80ca8cdb4c3 100644 (file)
--- a/js/ui/switcherPopup.js
+++ b/js/ui/switcherPopup.js
@@ -1,11 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
+const { Clutter, GLib, GObject, Meta, St } = imports.gi;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;

diff --git a/js/ui/tweener.js b/js/ui/tweener.js
index 499d9dc2fcdb9fa5acfd2aa5b8a55960c181aafa..bb9ea557caa7f37a8668da52ede27cf1798689a3 100644 (file)
--- a/js/ui/tweener.js
+++ b/js/ui/tweener.js
@@ -1,9 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
+const { Clutter, GLib, Shell, St } = imports.gi;
 const Signals = imports.signals;
 const Tweener = imports.tweener.tweener;
 

diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js
index 79b34a7242f27db8076126ea48590a05c54da858..5c9d46021e77e4461dfbd3cf44ed2c87223d45c5 100644 (file)
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -1,15 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const AccountsService = imports.gi.AccountsService;
-const Atk = imports.gi.Atk;
-const Clutter = imports.gi.Clutter;
-const Gdm  = imports.gi.Gdm;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Meta = imports.gi.Meta;
+const { AccountsService, Atk, Clutter,
+        Gdm, Gio, GLib, Meta, Shell, St } = imports.gi;
 const Signals = imports.signals;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
 
 const Layout = imports.ui.layout;
 const Main = imports.ui.main;

diff --git a/js/ui/userWidget.js b/js/ui/userWidget.js
index 88d4f1c9d579be030f8e71ab295aba14ae320ef5..05b3b758821b31d076c2461b21ad1d1f96a78914 100644 (file)
--- a/js/ui/userWidget.js
+++ b/js/ui/userWidget.js
@@ -2,10 +2,7 @@
 //
 // A widget showing the user avatar and name
 
-const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const St = imports.gi.St;
+const { Clutter, GLib, GObject, St } = imports.gi;
 
 const Params = imports.misc.params;
 

diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
index d887837a55c8914a09ed6a9174d70d95aa4a0e79..77146552db2e1fe0aeed6855f5be74048ea3df81 100644 (file)
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -1,12 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const Meta = imports.gi.Meta;
+const { Clutter, Gio, GObject, Meta, Shell, St } = imports.gi;
 const Signals = imports.signals;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-const GObject = imports.gi.GObject;
 
 const AppDisplay = imports.ui.appDisplay;
 const Main = imports.ui.main;

diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index bc7817f0e0a99939b7576f2ef4e2b16543dfeeb8..98bed26f219adf9635459bba55049e1e130e6733 100644 (file)
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -1,13 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
+const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
 const AltTab = imports.ui.altTab;

diff --git a/js/ui/windowMenu.js b/js/ui/windowMenu.js
index 354466b3cca4e1cd03324c32004d34b78b7e9c63..628f145ea9fcd2498520b12e8769baa6797356dd 100644 (file)
--- a/js/ui/windowMenu.js
+++ b/js/ui/windowMenu.js
@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*
 
-const Meta = imports.gi.Meta;
-const St = imports.gi.St;
+const { Meta, St } = imports.gi;
 
 const BoxPointer = imports.ui.boxpointer;
 const Main = imports.ui.main;

diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index f100131cf8048d459ce4c662dc4b8bf3a074250a..9c58861449e80aaa5bed5a075b7ccd378f9ccdac 100644 (file)
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -1,15 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Atk = imports.gi.Atk;
-const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
+const { Atk, Clutter, GLib, GObject, Meta, Pango, Shell, St } = imports.gi;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const Pango = imports.gi.Pango;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
 const DND = imports.ui.dnd;
 const Main = imports.ui.main;

diff --git a/js/ui/workspaceSwitcherPopup.js b/js/ui/workspaceSwitcherPopup.js
index 7283f5ece6ca1f5c4d03bb728c691e7a6ee84ad2..26404eaab84ad0334a6d5acc4039d10e8ab5e1dc 100644 (file)
--- a/js/ui/workspaceSwitcherPopup.js
+++ b/js/ui/workspaceSwitcherPopup.js
@@ -1,11 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
+const { Clutter, GLib, GObject, Meta, St } = imports.gi;
 const Mainloop = imports.mainloop;
-const Meta  = imports.gi.Meta;
-const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;

diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
index ed7e3378b32975b6a63a2ead76278b959017862e..73cf7b4d176b82a06ffc57fca0064244eb0c06be 100644 (file)
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -1,14 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
+const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
 const Background = imports.ui.background;
 const DND = imports.ui.dnd;

diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index eacb055f889c9fd1c336d2ad2fbcf7a24ceec05d..d2557a4fd5533b7cc43b3915acd05a1d89916073 100644 (file)
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -1,10 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
-const Meta = imports.gi.Meta;
-const St = imports.gi.St;
+const { Clutter, Gio, GObject, Meta, St } = imports.gi;
 const Signals = imports.signals;
 
 const Main = imports.ui.main;

diff --git a/js/ui/xdndHandler.js b/js/ui/xdndHandler.js
index cd53e055b35e1aa4e54c2806ffabf64f4144fc1d..c3b3b5e67733981408c3d7323bd5fa1ad75a0781 100644 (file)
--- a/js/ui/xdndHandler.js
+++ b/js/ui/xdndHandler.js
@@ -1,10 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
-const Main = imports.ui.main;
-const Meta = imports.gi.Meta;
+const { Clutter, Meta } = imports.gi;
 const Signals = imports.signals;
+
 const DND = imports.ui.dnd;
+const Main = imports.ui.main;
 
 var XdndHandler = class {
     constructor() {

diff --git a/tests/interactive/background-repeat.js b/tests/interactive/background-repeat.js
index 2b83411c4129085defcc32b516de897cf353c76b..1377f742494715f4399bf7db8ec62327103840e4 100644 (file)
--- a/tests/interactive/background-repeat.js
+++ b/tests/interactive/background-repeat.js
@@ -2,8 +2,7 @@
 
 const UI = imports.testcommon.ui;
 
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
+const { Clutter, St } = imports.gi;
 
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });

diff --git a/tests/interactive/background-size.js b/tests/interactive/background-size.js
index 7e269ff12903ba55382cbea82b25501bc8d9d784..91f8149c7905426974fa9cf2a4671e7e5cd1ee39 100644 (file)
--- a/tests/interactive/background-size.js
+++ b/tests/interactive/background-size.js
@@ -2,9 +2,7 @@
 
 const UI = imports.testcommon.ui;
 
-const Cogl = imports.gi.Cogl;
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
+const { Cogl, Clutter, St } = imports.gi;
 
 
 function test() {

diff --git a/tests/interactive/border-radius.js b/tests/interactive/border-radius.js
index 3b7d3d306cea641e0e155edc7d22d78ab430f453..4d26518bdc7c5b1a13891587f84c2eee88005b47 100644 (file)
--- a/tests/interactive/border-radius.js
+++ b/tests/interactive/border-radius.js
@@ -2,8 +2,7 @@
 
 const UI = imports.testcommon.ui;
 
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
+const { Clutter, St } = imports.gi;
 
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });

diff --git a/tests/interactive/border-width.js b/tests/interactive/border-width.js
index cb84187e09838b5e5ecbb7ddda33f05ccf43bdc9..30c7575a01002c4523e4f3f5ad8a003e03031aae 100644 (file)
--- a/tests/interactive/border-width.js
+++ b/tests/interactive/border-width.js
@@ -2,8 +2,7 @@
 
 const UI = imports.testcommon.ui;
 
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
+const { Clutter, St } = imports.gi;
 
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });

diff --git a/tests/interactive/borders.js b/tests/interactive/borders.js
index 23212e4fb03ca96d3b81aa2492b5bda071c64a32..4812acbfa9d446e363f947f238035f6952bf6305 100644 (file)
--- a/tests/interactive/borders.js
+++ b/tests/interactive/borders.js
@@ -2,8 +2,7 @@
 
 const UI = imports.testcommon.ui;
 
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
+const { Clutter, St } = imports.gi;
 
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });

diff --git a/tests/interactive/box-layout.js b/tests/interactive/box-layout.js
index 5eb83a46be546aa67188637f811ae5c2658c3c7f..bb9a5bbc2adeb28fc9a8024ea4e5105d2f3c3323 100644 (file)
--- a/tests/interactive/box-layout.js
+++ b/tests/interactive/box-layout.js
@@ -2,8 +2,7 @@
 
 const UI = imports.testcommon.ui;
 
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
+const { Clutter, St } = imports.gi;
 
 function test() {
     let stage = new Clutter.Stage();

diff --git a/tests/interactive/box-shadow-animated.js b/tests/interactive/box-shadow-animated.js
index 020c28976b76da7e216f98797aa577b1bd01e06c..5facee3dc40cc377d3925d6c7d5e2f68fad7893c 100644 (file)
--- a/tests/interactive/box-shadow-animated.js
+++ b/tests/interactive/box-shadow-animated.js
@@ -2,10 +2,8 @@
 
 const UI = imports.testcommon.ui;
 
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
+const { Clutter, GLib, St } = imports.gi;
 const Mainloop = imports.mainloop;
-const GLib = imports.gi.GLib;
 
 const DELAY = 2000;
 

diff --git a/tests/interactive/box-shadows.js b/tests/interactive/box-shadows.js
index 4a14df1c98df5c8b0839f21c7f9f503e4761a597..c9c677c97f629a2f5f746099bc83d6af3017cd61 100644 (file)
--- a/tests/interactive/box-shadows.js
+++ b/tests/interactive/box-shadows.js
@@ -2,8 +2,7 @@
 
 const UI = imports.testcommon.ui;
 
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
+const { Clutter, St } = imports.gi;
 
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });

diff --git a/tests/interactive/calendar.js b/tests/interactive/calendar.js
index 3253a4939d2c7b60364d5763d8a1a89cecb5a4e2..6428cb462e25ba9c87eb6c58e6e4aed376968beb 100644 (file)
--- a/tests/interactive/calendar.js
+++ b/tests/interactive/calendar.js
@@ -2,8 +2,7 @@
 
 const UI = imports.testcommon.ui;
 
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
+const { Clutter, St } = imports.gi;
 
 function test() {
     let stage = new Clutter.Stage({ width: 400, height: 400 });

diff --git a/tests/interactive/css-fonts.js b/tests/interactive/css-fonts.js
index 56c19055da15d7b27aa4069a3a2542c0da476b96..a25769318f8c7fe38c3b1836d645b835f2ba5fee 100644 (file)
--- a/tests/interactive/css-fonts.js
+++ b/tests/interactive/css-fonts.js
@@ -2,8 +2,7 @@
 
 const UI = imports.testcommon.ui;
 
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
+const { Clutter, St } = imports.gi;
 
 function test() {
     let stage = new Clutter.Stage();

diff --git a/tests/interactive/entry.js b/tests/interactive/entry.js
index c3dffb6a8c922bc548f0ead5445052186941f9e8..2f0abeab1ab903076d59a1f5bbe4758f7a285af6 100644 (file)
--- a/tests/interactive/entry.js
+++ b/tests/interactive/entry.js
@@ -2,9 +2,8 @@
 
 const UI = imports.testcommon.ui;
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, St } = imports.gi;
 const Mainloop = imports.mainloop;
-const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage({ width: 400, height: 400 });

diff --git a/tests/interactive/gapplication.js b/tests/interactive/gapplication.js
index d072b910c5fddfd73116abadb05d417a1b8d5cde..ec38b806f31d17561c271fca108cfc61583a7713 100755 (executable)
--- a/tests/interactive/gapplication.js
+++ b/tests/interactive/gapplication.js
@@ -1,13 +1,8 @@
 #!/usr/bin/env gjs
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-imports.gi.versions.Gdk = '3.0';
-imports.gi.versions.Gtk = '3.0';
-
-const Gdk = imports.gi.Gdk;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Gtk = imports.gi.Gtk;
+imports.gi.versions = { Gdk: '3.0', Gtk: '3.0' };
+const { Gdk, Gio, GLib, Gtk } = imports.gi;
 
 function do_action(action, parameter) {
     print ("Action '" + action.name + "' invoked");

diff --git a/tests/interactive/icons.js b/tests/interactive/icons.js
index 55afdbf2b3f888a3c69866665f50b10238a14b45..65b7f656090442ca70c169fcc305937995c23b85 100644 (file)
--- a/tests/interactive/icons.js
+++ b/tests/interactive/icons.js
@@ -2,8 +2,7 @@
 
 const UI = imports.testcommon.ui;
 
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
+const { Clutter, St } = imports.gi;
 
 function test() {
     let stage = new Clutter.Stage();

diff --git a/tests/interactive/inline-style.js b/tests/interactive/inline-style.js
index 2f9000579dfb064cf25299d493086c995f9a5e9b..3952c3a9844ae2f7e0c1297c79366450a3608cc6 100644 (file)
--- a/tests/interactive/inline-style.js
+++ b/tests/interactive/inline-style.js
@@ -2,8 +2,7 @@
 
 const UI = imports.testcommon.ui;
 
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
+const { Clutter, St } = imports.gi;
 
 function test() {
     let stage = new Clutter.Stage();

diff --git a/tests/interactive/scroll-view-sizing.js b/tests/interactive/scroll-view-sizing.js
index 9b264d05f49dbf027d8c117a0b197af7bade66fc..f01352188b4e976d7ce107e9117cd93fe8d4cd6f 100644 (file)
--- a/tests/interactive/scroll-view-sizing.js
+++ b/tests/interactive/scroll-view-sizing.js
@@ -2,11 +2,7 @@
 
 const UI = imports.testcommon.ui;
 
-const Clutter = imports.gi.Clutter;
-const GObject = imports.gi.GObject;
-const Gtk = imports.gi.Gtk;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
+const { Clutter, GObject, Gtk, Shell, St } = imports.gi;
 
 // This is an interactive test of the sizing behavior of StScrollView. It
 // may be interesting in the future to split out the two classes at the

diff --git a/tests/interactive/scrolling.js b/tests/interactive/scrolling.js
index 5087e5dfe4c4728ede2c8512e5a9712c8ae45608..91951ce10aef0654f772afb547b97b8ea0ca65e6 100644 (file)
--- a/tests/interactive/scrolling.js
+++ b/tests/interactive/scrolling.js
@@ -2,9 +2,7 @@
 
 const UI = imports.testcommon.ui;
 
-const Clutter = imports.gi.Clutter;
-const Gtk = imports.gi.Gtk;
-const St = imports.gi.St;
+const { Clutter, Gtk, St } = imports.gi;
 
 function test() {
     let stage = new Clutter.Stage();

diff --git a/tests/interactive/transitions.js b/tests/interactive/transitions.js
index acb5db479308266e4ecb6ec969a3bec8d113d1a1..7b2eac1c738f6c80535eb28fd36b6fddc0fb5155 100644 (file)
--- a/tests/interactive/transitions.js
+++ b/tests/interactive/transitions.js
@@ -2,8 +2,7 @@
 
 const UI = imports.testcommon.ui;
 
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
+const { Clutter, St } = imports.gi;
 
 function test() {
     let stage = new Clutter.Stage();

diff --git a/tests/testcommon/ui.js b/tests/testcommon/ui.js
index 291f3b1457e2f1ce0789a4bc33f13494920d6fa5..abacea5f7677728905a0b37e067e680dd7ddc0b1 100644 (file)
--- a/tests/testcommon/ui.js
+++ b/tests/testcommon/ui.js
@@ -2,13 +2,9 @@
 
 const Config = imports.misc.config;
 
-imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
-imports.gi.versions.Gtk = '3.0';
+imports.gi.versions = { Clutter: Config.LIBMUTTER_API_VERSION, Gtk: '3.0' };
 
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const St = imports.gi.St;
+const { Clutter, Gio, GLib, St } = imports.gi;
 
 const Environment = imports.ui.environment;